projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2645b5a)
gtk: Replace -gtk-icon-effect with -gtk-icon-filter
authorBenjamin Otte <otte@redhat.com>
Sat, 31 Dec 2016 00:29:14 +0000 (01:29 +0100)
committerBenjamin Otte <otte@redhat.com>
Sat, 31 Dec 2016 01:49:47 +0000 (02:49 +0100)
Instead of
  -gtk-icon-effect: dim;
  -gtk-icon-effect: hilight;
we now use
  -gtk-icon-filter: opacity(0.5);
  -gtk-icon-filter: brightness(1.2);
respectively.

gtk/theme/Adwaita/_common.scss patch | blob | history
gtk/theme/Adwaita/gtk-contained-dark.css patch | blob | history
gtk/theme/Adwaita/gtk-contained.css patch | blob | history
gtk/theme/HighContrast/_common.scss patch | blob | history
gtk/theme/HighContrast/gtk-contained-inverse.css patch | blob | history
gtk/theme/HighContrast/gtk-contained.css patch | blob | history
testsuite/reftests/gtk-image-effect-inherit.css patch | blob | history
testsuite/reftests/icon-effect-missing.css patch | blob | history

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7f94578903c858880ebb025a5c8a64e3ee511e38..c06fb5b89cfe4fb5d7b8fbed812da94e6065e24e 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -63,7 +63,7 @@ $button_transition: all 200ms $ease-out-quad;
    Everytime a wildcard is used a kitten dies, painfully.
 */
 
-*:disabled { -gtk-icon-effect: dim; }
+*:disabled { -gtk-icon-filter: opacity(0.5); }
 
 .gtkstyle-fallback {
   color: $fg_color;
@@ -454,7 +454,7 @@ button {
 
     &:hover {
       @include button(hover);
-      -gtk-icon-effect: highlight;
+      -gtk-icon-filter: brightness(1.2);
     }
 
     &:active,
@@ -469,7 +469,7 @@ button {
         @include button(backdrop);
 
         transition: $backdrop_transition;
-        -gtk-icon-effect: none;
+        -gtk-icon-filter: none;
 
         &:active,
         &:checked { @include button(backdrop-active); }
@@ -1410,7 +1410,7 @@ headerbar {
         &.flat, & {
           @include button(backdrop, $selected_bg_color, $selected_fg_color);
 
-          -gtk-icon-effect: none;
+          -gtk-icon-filter: none;
           border-color: $selected_borders_color;
 
           &:active,
@@ -4083,7 +4083,7 @@ colorchooser .popover.osd { border-radius: 5px; }
 .content-view {
   background-color: darken($bg_color,7%);
 
-  &:hover { -gtk-icon-effect: highlight; }
+  &:hover { -gtk-icon-filter: brightness(1.2); }
 
   &:backdrop { background-color: darken($bg_color,7%); }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3df017f3c4198b886eb09ef5191ce2ad09f12909..9a1dad985b4478e7a42aa50cb2a894f45a917eab 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -34,7 +34,7 @@
    Everytime a wildcard is used a kitten dies, painfully.
 */
 *:disabled {
-  -gtk-icon-effect: dim; }
+  -gtk-icon-filter: opacity(0.5); }
 
 .gtkstyle-fallback {
   color: #eeeeec;
@@ -442,7 +442,7 @@ button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.77945);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
     background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30);
-    -gtk-icon-effect: highlight; }
+    -gtk-icon-filter: brightness(1.2); }
   notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > arrow:checked, button.titlebutton:checked,
   button:active,
   button:checked {
@@ -463,7 +463,7 @@ button {
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     transition: 200ms ease-out;
-    -gtk-icon-effect: none; }
+    -gtk-icon-filter: none; }
     notebook > header > tabs > arrow:backdrop label, button.sidebar-button:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
     button:backdrop.flat label,
     button:backdrop.flat,
@@ -1801,7 +1801,7 @@ headerbar {
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-        -gtk-icon-effect: none;
+        -gtk-icon-filter: none;
         border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button:backdrop.flat label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop label, .selection-mode.titlebar:not(headerbar) button:backdrop,
         headerbar.selection-mode button:backdrop.flat label,
@@ -4393,7 +4393,7 @@ colorchooser .popover.osd {
 .content-view {
   background-color: #222728; }
   .content-view:hover {
-    -gtk-icon-effect: highlight; }
+    -gtk-icon-filter: brightness(1.2); }
   .content-view:backdrop {
     background-color: #222728; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 411bfc9bb79604a4b022db88d8ce858d81312be0..580af98c87b69689caa9e4ff5cb6601226a709d5 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -34,7 +34,7 @@
    Everytime a wildcard is used a kitten dies, painfully.
 */
 *:disabled {
-  -gtk-icon-effect: dim; }
+  -gtk-icon-filter: opacity(0.5); }
 
 .gtkstyle-fallback {
   color: #2e3436;
@@ -442,7 +442,7 @@ button {
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white;
     background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd);
-    -gtk-icon-effect: highlight; }
+    -gtk-icon-filter: brightness(1.2); }
   notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > arrow:checked, button.titlebutton:checked,
   button:active,
   button:checked {
@@ -463,7 +463,7 @@ button {
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     transition: 200ms ease-out;
-    -gtk-icon-effect: none; }
+    -gtk-icon-filter: none; }
     notebook > header > tabs > arrow:backdrop label, button.sidebar-button:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
     button:backdrop.flat label,
     button:backdrop.flat,
@@ -1810,7 +1810,7 @@ headerbar {
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-        -gtk-icon-effect: none;
+        -gtk-icon-filter: none;
         border-color: #184472; }
         .selection-mode.titlebar:not(headerbar) button:backdrop.flat label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop label, .selection-mode.titlebar:not(headerbar) button:backdrop,
         headerbar.selection-mode button:backdrop.flat label,
@@ -4424,7 +4424,7 @@ colorchooser .popover.osd {
 .content-view {
   background-color: #d7d7d5; }
   .content-view:hover {
-    -gtk-icon-effect: highlight; }
+    -gtk-icon-filter: brightness(1.2); }
   .content-view:backdrop {
     background-color: #d7d7d5; }
 
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 986027282b1dacb75a32196b949475e3f8f3ce38..d36cb42c02b786f4a924dd969ebb099a8f922759 100644 (file)
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -64,7 +64,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
 
 
 *:disabled {
-    -gtk-icon-effect: dim;
+    -gtk-icon-filter: opacity(0.5);
 }
 
 .gtkstyle-fallback {
@@ -383,7 +383,7 @@ button {
 
     &:hover {
       @include button(hover);
-      -gtk-icon-effect: highlight;
+      -gtk-icon-filter: brightness(1.2);
     }
 
     &:active,
@@ -396,7 +396,7 @@ button {
     &:backdrop {
       @include button(backdrop);
 
-      -gtk-icon-effect: none;
+      -gtk-icon-filter: none;
 
       &:active,
       &:checked { @include button(backdrop-active); }
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index da7a13d32385347f771e32f974b922784008a4f3..5f4e55f3ace22c491cc6a3dc19408952066c2f00 100644 (file)
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -68,7 +68,7 @@
    Everytime a wildcard is used a kitten dies, painfully.
 */
 *:disabled {
-  -gtk-icon-effect: dim; }
+  -gtk-icon-filter: opacity(0.5); }
 
 .gtkstyle-fallback {
   background-color: #000;
@@ -415,7 +415,7 @@ button.titlebutton, button {
     background-color: #000;
     border-color: gray;
     background-image: none;
-    -gtk-icon-effect: highlight; }
+    -gtk-icon-filter: brightness(1.2); }
   button.titlebutton:active, button.titlebutton:checked, button:active, button:checked {
     border-width: 2px;
     border-style: solid;
@@ -431,7 +431,7 @@ button.titlebutton, button {
     background-color: #000;
     border-color: #737373;
     background-image: none;
-    -gtk-icon-effect: none; }
+    -gtk-icon-filter: none; }
     button.titlebutton:backdrop:active, button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked {
       border-width: 2px;
       border-style: solid;
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 9a338ded64bea1e39634a4f45508c71be4902ccb..b580a3d863003f5748d02adeb4953bd830daaec1 100644 (file)
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -68,7 +68,7 @@
    Everytime a wildcard is used a kitten dies, painfully.
 */
 *:disabled {
-  -gtk-icon-effect: dim; }
+  -gtk-icon-filter: opacity(0.5); }
 
 .gtkstyle-fallback {
   background-color: #fff;
@@ -415,7 +415,7 @@ button.titlebutton, button {
     background-color: #fff;
     border-color: gray;
     background-image: none;
-    -gtk-icon-effect: highlight; }
+    -gtk-icon-filter: brightness(1.2); }
   button.titlebutton:active, button.titlebutton:checked, button:active, button:checked {
     border-width: 2px;
     border-style: solid;
@@ -431,7 +431,7 @@ button.titlebutton, button {
     background-color: #fff;
     border-color: #8d8d8d;
     background-image: none;
-    -gtk-icon-effect: none; }
+    -gtk-icon-filter: none; }
     button.titlebutton:backdrop:active, button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked {
       border-width: 2px;
       border-style: solid;
diff --git a/testsuite/reftests/gtk-image-effect-inherit.css b/testsuite/reftests/gtk-image-effect-inherit.css
index f59d33d667907a4578e4c1495c389029544e241f..a5d8b23e77b1425b39b444c6f935aa78d7fb9f7b 100644 (file)
--- a/testsuite/reftests/gtk-image-effect-inherit.css
+++ b/testsuite/reftests/gtk-image-effect-inherit.css
@@ -1,11 +1,11 @@
 GtkBox > :nth-child(1) {
-  -gtk-icon-effect: none;
+  -gtk-icon-filter: none;
 }
 
 GtkBox > :nth-child(2) {
-  -gtk-icon-effect: highlight;
+  -gtk-icon-filter: brightness(1.2);
 }
 
 GtkBox > :nth-child(3) {
-  -gtk-icon-effect: dim;
+  -gtk-icon-filter: opacity(0.5);
 }
diff --git a/testsuite/reftests/icon-effect-missing.css b/testsuite/reftests/icon-effect-missing.css
index a3faf81738290aacf77f558cf402fc4aefc5cdd6..286b56e7855bbb47788c17f1f66ed827048100f6 100644 (file)
--- a/testsuite/reftests/icon-effect-missing.css
+++ b/testsuite/reftests/icon-effect-missing.css
@@ -1,11 +1,11 @@
 * {
-  -gtk-icon-effect: none;
+  -gtk-icon-filter: none;
 }
 
 :nth-child(2) {
-  -gtk-icon-effect: dim;
+  -gtk-icon-filter: opacity(0.5);
 }
 
 :nth-child(3) {
-  -gtk-icon-effect: highlight;
+  -gtk-icon-filter: brightness(1.2);
 }
Unnamed repository; edit this file 'description' to name the repository.